Merge branch 'upstream'
authorBernd Zeimetz <bernd@bzed.de>
Wed, 5 Aug 2009 22:35:28 +0000 (00:35 +0200)
committerBernd Zeimetz <bernd@bzed.de>
Wed, 5 Aug 2009 22:35:28 +0000 (00:35 +0200)

Trivial merge